diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java
index a13931aa3..0f55cbd55 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Range.java
@@ -336,7 +336,7 @@ public class Range
 
     int insertIndex = _end - tp.getStart();
 
-    if (tp.getStringBuffer().charAt(_end - 1) == '\r')
+    if (tp.getStringBuffer().charAt(_end - 1) == '\r' && text.charAt(0) != '\u0007')
     {
       insertIndex--;
     }
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Section.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Section.java
index 73aff3137..65aee3748 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Section.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Section.java
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 
 package org.apache.poi.hwpf.usermodel;
 
@@ -37,6 +37,11 @@ public class Section
     return TYPE_SECTION;
   }
 
+  public int getNumColumns()
+  {
+    return _props.getCcolM1() + 1;
+  }
+
   public Object clone()
      throws CloneNotSupportedException
    {
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Table.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Table.java
index 6882c3aaf..42aa6570b 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Table.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/Table.java
@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 ==================================================================== */
-        
+
 package org.apache.poi.hwpf.usermodel;
 
 import java.util.ArrayList;
@@ -36,12 +36,12 @@ public class Table
     while (rowEnd < numParagraphs)
     {
       Paragraph p = getParagraph(rowEnd);
-      rowEnd++;
       if (p.isTableRowEnd() && p.getTableLevel() == levelNum)
       {
         _rows.add(new TableRow(rowStart, rowEnd, this, levelNum));
         rowStart = rowEnd;
       }
+      rowEnd++;
     }
   }