diff --git a/src/buf.c b/src/buf.c
index 0ff40ab..9f47325 100644
--- a/src/buf.c
+++ b/src/buf.c
@@ -548,7 +548,8 @@ dup_argv (int argc, char **argv, ed_buffer_t *ed)
   int i;
 
   REALLOC_THROW (pathv_p, pathv_p_size,
-                 (argc + 1) * sizeof (char *), NULL, ed);
+                 (argc + 1) * sizeof (char *),
+                 NULL, ed);
 
   for (i = 0, pathv_p[i] = NULL; i < argc; ++i, pathv_p[i] = NULL, len = 0)
     {
diff --git a/src/cmds.c b/src/cmds.c
index 23e93ad..4bfac92 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -214,7 +214,7 @@ move_lines (off_t from, off_t to, off_t after, ed_buffer_t *ed)
   else
     {
       a1 = get_line_node (succ, ed);
-      if (from > after)
+      if (after < from)
         {
           b1 = get_line_node (prec, ed);
 
@@ -232,7 +232,7 @@ move_lines (off_t from, off_t to, off_t after, ed_buffer_t *ed)
       LINK_NODES (b2, b1->q_forw);
       LINK_NODES (a1->q_back, a2);
       LINK_NODES (b1, a1);
-      ed->state->dot = after + (from > after ? to - from + 1 : 0);
+      ed->state->dot = after + (after < from ? to - from + 1 : 0);
     }
   if (ed->exec->global)
     clear_global_lines (b2->q_forw, a2, to - from + 1, ed);
diff --git a/src/ed.h b/src/ed.h
index 1092f94..9228791 100644
--- a/src/ed.h
+++ b/src/ed.h
@@ -242,7 +242,7 @@ enum utf8_char_constant
 # define STAT(x, y)  stat ((x), (y))
 #endif  /* !HAVE_STAT64 */
 
-/* In-core and hold node. */
+/* In-core line node. */
 typedef struct ed_line_node
 {
   struct ed_line_node *q_forw;
@@ -394,7 +394,7 @@ struct ed_core
 {
 
 #ifdef WANT_ED_REGISTER
-  /* Register buffers and line markers. */
+  /* Register buffer. */
   struct ed_register *regbuf;
 #endif
 
@@ -404,6 +404,7 @@ struct ed_core
   int sp;                       /* Script buffer stack pointer. */
 #endif
 
+  /*  Line markers */
   ed_line_node_t *mark[MARK_MAX];
   int marks;
 
@@ -705,7 +706,7 @@ enum search_type
   while (0)
 
 
-/* LINK_NODES: Link prev and next nodes. */
+/* LINK_NODES: Link nodes `prev' and `next'. */
 #define LINK_NODES(prev, next)                                                \
   ((prev)->q_forw = (next), (next)->q_back = (prev))
 
@@ -713,10 +714,10 @@ enum search_type
 #define INIT_DEQUE(node) LINK_NODES ((node), (node))
 
 /*
- * APPEND_NODE: Append node after prev.
- * CAVEAT UTILITOR: APPEND_NODE fails when `prev' of the form
- * p->q_back.  The workaround is to assign t = p->q_back and then
- * call APPEND_NODE(n, t).
+ * APPEND_NODE: Append node `node' after `prev'.
+ * Caveat: This fails when `prev' of the form `p->q_back'. The
+ *   workaround is to assign t = p->q_back and then call
+ *   APPEND_NODE(n, t).
  */
 #define APPEND_NODE(node, prev)                                               \
   do                                                                          \
@@ -726,7 +727,7 @@ enum search_type
     }                                                                         \
   while (0)
 
-/* UNLINK_NODE: Remove node from deque. */
+/* UNLINK_NODE: Remove node `node' from deque. */
 #define UNLINK_NODE(node)                                                     \
   LINK_NODES ((node)->q_back, (node)->q_forw)
 
@@ -741,7 +742,7 @@ enum search_type
     }                                                                         \
   while (0)
 
-/* REALLOC_THROW: Assure at least a minimum size for buffer b. */
+/* REALLOC_THROW: Assure minimum size `i' for buffer `b' with size `n'. */
 #define REALLOC_THROW(b, n, i, err, ed)                                       \
   do                                                                          \
     {                                                                         \
diff --git a/src/re.c b/src/re.c
index e069b63..208c51b 100644
--- a/src/re.c
+++ b/src/re.c
@@ -21,7 +21,7 @@ get_compiled_regex (unsigned dc, int re_type, ed_buffer_t *ed)
   static char re_err[BUFSIZ];   /* regex error message buffer */
 #endif
 
-  char *pattern;
+  char *pattern = NULL;
   size_t len = 0;
 
 #ifndef HAVE_REG_SYNTAX_T
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 9acd83b..c6c0dbc 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -92,7 +92,7 @@ ED_SCRIPTS_OK_MF =							      \
 ED_SCRIPTS_OK_R =							      \
 	rmt1.tr rmt2.tr rmt3.tr
 
-# Ed scripts which should complete sucessfully if registers are available.
+# Ed scripts which should complete sucessfully if macros are available.
 ED_SCRIPTS_OK_XM =							      \
 	mac1.txm mac2.txm mac3.txm