diff --git a/github-review.el b/github-review.el
index 3a237d9..54cc5f0 100644
--- a/github-review.el
+++ b/github-review.el
@@ -352,12 +352,12 @@ This function infers the PR name based on the current filename"
 
 (defun github-review-to-comments (text)
   "Convert TEXT, a string to a string where each line is prefixed by ~."
-  (s-join "\n" (-concat (list " ") (-map (lambda (x) (concat "~ " x)) (s-split "\n" text)))))
+  (s-join "\n" (-map (lambda (x) (concat "~ " x)) (s-split "\n" text))))
 
 (defun github-review-format-top-level-comment (com)
   "Format a top level COM objectto string."
   (let-alist com
-    (format "Commented by @%s: %s" .author.login .bodyText)))
+    (format "@%s: %s" .author.login .bodyText)))
 
 (defun github-review-format-review (review)
   "Format a REVIEW object to string."
@@ -394,11 +394,12 @@ Github API provides only the originalPosition in the query.")
 
                  (setq github-review-comment-pos (+ (or github-review-comment-pos 0)
                                                     (length comment-lines)
-                                                    (length body-lines)))
+                                                    (if (string-empty-p body)
+                                                        0
+                                                      (length body-lines))))
                  (-concat
                   (-first-item diff-splitted)
-                  (list ""
-                        (format "~ Reviewed by @%s[%s]: %s" at state
+                  (list (format "~ Reviewed by @%s[%s]: %s" at state
                                 (if (string-empty-p body)
                                     (-first-item comment-lines)
                                   (-first-item body-lines))))
diff --git a/test/github-review-test.el b/test/github-review-test.el
index 457cf7c..6b41ea0 100644
--- a/test/github-review-test.el
+++ b/test/github-review-test.el
@@ -125,6 +125,37 @@ index 9eced0230..4512bb335 100644
 +type MultiBalanceReport    = PeriodicReport AccountName MixedAmount
 +type MultiBalanceReportRow = PeriodicReportRow AccountName MixedAmount
 
+ -- type alias just to remind us which AccountNames might be depth-clipped, below.
+ type ClippedAccountName = AccountName
+")
+
+    (defconst example-diff-before-comments-in-code-line "diff --git a/hledger-lib/Hledger/Reports/MultiBalanceReport.hs b/hledger-lib/Hledger/Reports/MultiBalanceReport.hs
+index 9eced0230..4512bb335 100644
+--- a/hledger-lib/Hledger/Reports/MultiBalanceReport.hs
++++ b/hledger-lib/Hledger/Reports/MultiBalanceReport.hs
+
+-type MultiBalanceReport    = PeriodicReport AccountLeaf MixedAmount
+-type MultiBalanceReportRow = PeriodicReportRow AccountLeaf MixedAmount
++type MultiBalanceReport    = PeriodicReport AccountName MixedAmount
++type MultiBalanceReportRow = PeriodicReportRow AccountName MixedAmount
+
+ -- type alias just to remind us which AccountNames might be depth-clipped, below.
+ type ClippedAccountName = AccountName
+")
+
+    (defconst example-diff-after-comments-in-code-line "diff --git a/hledger-lib/Hledger/Reports/MultiBalanceReport.hs b/hledger-lib/Hledger/Reports/MultiBalanceReport.hs
+index 9eced0230..4512bb335 100644
+--- a/hledger-lib/Hledger/Reports/MultiBalanceReport.hs
++++ b/hledger-lib/Hledger/Reports/MultiBalanceReport.hs
+
+-type MultiBalanceReport    = PeriodicReport AccountLeaf MixedAmount
+-type MultiBalanceReportRow = PeriodicReportRow AccountLeaf MixedAmount
+~ Reviewed by @babar[COMMENTED]: Very interesting change
+~ we should move forward
++type MultiBalanceReport    = PeriodicReport AccountName MixedAmount
++type MultiBalanceReportRow = PeriodicReportRow AccountName MixedAmount
+~ Reviewed by @babar[COMMENTED]: Change this code
+
  -- type alias just to remind us which AccountNames might be depth-clipped, below.
  type ClippedAccountName = AccountName
 ")
@@ -294,11 +325,35 @@ index 58baa4b..eae7707 100644
                                  'bodyText "LGTM"
                                  'state "APPROVED")))))
 
+    (defconst review-with-comments
+      (a-alist 'author (a-alist 'login "babar")
+               'state "COMMENTED"
+               'bodyText ""
+               'comments (a-alist
+                          'nodes
+                          (list (a-alist 'bodyText "Very interesting change\nwe should move forward"
+                                         'originalPosition 2)
+                           (a-alist 'bodyText "Change this code"
+                                         'originalPosition 4)
+                                ))))
+
     (describe "github-review-format-diff"
       (it "can format a simple diff"
         (expect (a-equal (github-review-format-diff simple-diff simple-pr)simple-context-expected-review)))
       (it "can format a diff with top level comments and review"
-        (expect (a-equal (github-review-format-diff simple-diff pr-with-tl-comments)  expected-review-tl-comment)))))
+        (expect (a-equal (github-review-format-diff simple-diff pr-with-tl-comments)  expected-review-tl-comment))))
+
+    (describe "github-review-place-review-comments"
+      (before-all
+        (setq github-review-comment-pos nil)
+        (setq github-review-view-comments-in-code-lines nil))
+      (it "can include PR comments made in code lines"
+        (expect (github-review-place-review-comments example-diff-before-comments-in-code-line review-with-comments)
+                :to-equal
+                example-diff-after-comments-in-code-line))
+      (it "`github-review-comment-pos' should have increased to 3 because we have 2 comments with 3 lines"
+        (expect github-review-comment-pos :to-equal 3))))
+
   (describe "entrypoints"
     (describe "github-review-start"
       :var (github-review-save-diff