diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 75b47c8..fe49fed 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,9 +4,9 @@
     <list default="true" id="fe00182d-05fa-4529-8d2b-92bd952d65d2" name="Default Changelist" comment="Basics of packaging, bug fixes, better updating">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/dist/block_mirror.js" beforeDir="false" afterPath="$PROJECT_DIR$/dist/block_mirror.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/block_editor.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/block_editor.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/block_mirror.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/block_mirror.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/text_editor.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/text_editor.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/text_to_blocks.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/text_to_blocks.js" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -160,7 +160,16 @@
       <workItem from="1566563017463" duration="16000" />
       <workItem from="1567085840789" duration="2056000" />
       <workItem from="1567195590761" duration="1369000" />
-      <workItem from="1567227774065" duration="2465000" />
+      <workItem from="1567227774065" duration="6316000" />
+      <workItem from="1567366852789" duration="167000" />
+      <workItem from="1567517743281" duration="33000" />
+      <workItem from="1567777551526" duration="502000" />
+      <workItem from="1567883315726" duration="694000" />
+      <workItem from="1567964675434" duration="2672000" />
+      <workItem from="1568146240500" duration="2288000" />
+      <workItem from="1568400256383" duration="603000" />
+      <workItem from="1568432956949" duration="2302000" />
+      <workItem from="1568665354474" duration="1573000" />
     </task>
     <task id="LOCAL-00001" summary="Basics of packaging, bug fixes, better updating">
       <created>1564063805490</created>
diff --git a/dist/block_mirror.js b/dist/block_mirror.js
index 7f1edd0..5c90249 100644
--- a/dist/block_mirror.js
+++ b/dist/block_mirror.js
@@ -356,7 +356,6 @@ BlockMirror.prototype.VISIBLE_MODES = {
 BlockMirror.prototype.BREAK_WIDTH = 675;
 
 BlockMirror.prototype.setHighlightedLines = function (lines, style) {
-  this.textEditor.clearHighlightedLines();
   this.textEditor.setHighlightedLines(lines, style); //this.blockEditor.highlightLines(lines, style);
 };
 
@@ -594,11 +593,21 @@ BlockMirrorTextEditor.prototype.setHighlightedLines = function (lines, style) {
 BlockMirrorTextEditor.prototype.clearHighlightedLines = function () {
   var _this3 = this;
 
-  return this.highlightedHandles.map(function (h) {
-    _this3.codeMirror.doc.removeLineClass(h.handle, "background", h.style);
+  if (this.highlightedHandles) {
+    var removed = this.highlightedHandles.map(function (h) {
+      _this3.codeMirror.doc.removeLineClass(h.handle, "background", h.style);
 
-    return _this3.codeMirror.doc.lineInfo(h.handle).line + 1;
-  });
+      var info = _this3.codeMirror.doc.lineInfo(h.handle);
+
+      if (info) {
+        return info.line + 1;
+      } else {
+        return info;
+      }
+    });
+    this.highlightedHandles = [];
+    return removed;
+  }
 };
 /**
  * Worth noting - Blockly uses a setTimeOut of 0 steps to make events
@@ -1272,7 +1281,12 @@ BlockMirrorTextToBlocks.prototype.convertBody = function (node, parent) {
   if (lastLineNumber in this.comments) {
     var _commentChild = this.ast_Comment(this.comments[lastLineNumber], lastLineNumber);
 
-    nestChild(_commentChild);
+    if (is_top_level && !previousWasStatement) {
+      addPeer(_commentChild);
+    } else {
+      nestChild(_commentChild);
+    }
+
     delete this.comments[lastLineNumber];
   } // Handle any extra comments that stuck around
 
diff --git a/src/block_mirror.js b/src/block_mirror.js
index 8bc2100..4bae3bc 100644
--- a/src/block_mirror.js
+++ b/src/block_mirror.js
@@ -217,7 +217,6 @@ BlockMirror.prototype.VISIBLE_MODES = {
 BlockMirror.prototype.BREAK_WIDTH = 675;
 
 BlockMirror.prototype.setHighlightedLines = function(lines, style) {
-    this.textEditor.clearHighlightedLines();
     this.textEditor.setHighlightedLines(lines, style);
     //this.blockEditor.highlightLines(lines, style);
 };
diff --git a/src/text_editor.js b/src/text_editor.js
index 731e69a..822e9ea 100644
--- a/src/text_editor.js
+++ b/src/text_editor.js
@@ -217,8 +217,17 @@ BlockMirrorTextEditor.prototype.setHighlightedLines = function (lines, style) {
 };
 
 BlockMirrorTextEditor.prototype.clearHighlightedLines = function () {
-    return this.highlightedHandles.map((h) => {
-        this.codeMirror.doc.removeLineClass(h.handle, "background", h.style);
-        return this.codeMirror.doc.lineInfo(h.handle).line+1;
-    });
+    if (this.highlightedHandles) {
+        let removed = this.highlightedHandles.map((h) => {
+            this.codeMirror.doc.removeLineClass(h.handle, "background", h.style);
+            var info = this.codeMirror.doc.lineInfo(h.handle);
+            if (info) {
+                return info.line + 1;
+            } else {
+                return info;
+            }
+        });
+        this.highlightedHandles = [];
+        return removed;
+    }
 };
\ No newline at end of file
diff --git a/src/text_to_blocks.js b/src/text_to_blocks.js
index e18a85f..d36550d 100644
--- a/src/text_to_blocks.js
+++ b/src/text_to_blocks.js
@@ -7,13 +7,13 @@ function BlockMirrorTextToBlocks(blockMirror) {
 
 BlockMirrorTextToBlocks.xmlToString = function (xml) {
     return new XMLSerializer().serializeToString(xml);
-}
+};
 
 BlockMirrorTextToBlocks.prototype.convertSourceToCodeBlock = function (python_source) {
     var xml = document.createElement("xml");
     xml.appendChild(BlockMirrorTextToBlocks.raw_block(python_source));
     return BlockMirrorTextToBlocks.xmlToString(xml);
-}
+};
 
 /**
  * The main function for converting a string representation of Python
@@ -245,13 +245,13 @@ BlockMirrorTextToBlocks.prototype.convertBody = function (node, parent) {
         // Handle top-level expression blocks
         if (is_top_level && newChild.constructor === Array) {
             addPeer(newChild[0]);
-            // Handle skipped line
+        // Handle skipped line
         } else if (is_top_level && skipped_line && visitedFirstLine) {
             addPeer(newChild);
-            // The previous line was not a Peer
+        // The previous line was not a Peer
         } else if (is_top_level && !previousWasStatement) {
             addPeer(newChild);
-            // Otherwise, always embed it in there.
+        // Otherwise, always embed it in there.
         } else {
             nestChild(newChild);
         }
@@ -265,7 +265,11 @@ BlockMirrorTextToBlocks.prototype.convertBody = function (node, parent) {
     var lastLineNumber = lineNumberInProgram + 1;
     if (lastLineNumber in this.comments) {
         let commentChild = this.ast_Comment(this.comments[lastLineNumber], lastLineNumber);
-        nestChild(commentChild);
+        if (is_top_level && !previousWasStatement) {
+            addPeer(commentChild);
+        } else {
+            nestChild(commentChild);
+        }
         delete this.comments[lastLineNumber];
     }