diff --git a/TODO.txt b/TODO.txt
index 7b4cf18c896b4eaeb3070ba5f74ea98249483ec1_VE9ETy50eHQ=..0e0a2d20deed9552df41153fde587a8145b1c64d_VE9ETy50eHQ= 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -5,7 +5,6 @@
   - hg fetch [remote] (remote is url, hg alias or hg-git remote)
   - hg clone url
 * fail nicely when the remote_name is not there
-* more tests
 * submodules?
 * .gitignore, etc - try to convert? 
   - (probably not automatically, but perhaps a generator?)
@@ -24,8 +23,8 @@
 MAPPING ISSUES
 ==============
 Created in Hg:
-* named branches #
-* merges with renames - dont convert back properly for some reason
+* merges with renames in 2nd branch
+  - dont convert back properly for some reason
 
 Created in Git:
 * different committer in Git objects
diff --git a/git_handler.py b/git_handler.py
index 7b4cf18c896b4eaeb3070ba5f74ea98249483ec1_Z2l0X2hhbmRsZXIucHk=..0e0a2d20deed9552df41153fde587a8145b1c64d_Z2l0X2hhbmRsZXIucHk= 100644
--- a/git_handler.py
+++ b/git_handler.py
@@ -201,7 +201,7 @@
             author = author + ' <none@none>'
         commit['author'] = author + ' ' + str(int(time)) + ' ' + seconds_to_offset(timezone)
         message = ctx.description()
-        commit['message'] = ctx.description()
+        commit['message'] = ctx.description() + "\n"
 
         # HG EXTRA INFORMATION
         add_extras = False
@@ -216,7 +216,7 @@
                 extra_message += "rename : " + oldfile + " => " + newfile + "\n"
             
         if add_extras:
-            commit['message'] += "\n\n--HG--\n" + extra_message
+            commit['message'] += "\n--HG--\n" + extra_message
 
         commit['parents'] = []
         for parent in parents: