diff --git a/app/components/SimpleEditor/config.js b/app/components/SimpleEditor/config.js
index 0984a6ac8b65b7861de603f60bd92d5ed0cf36e3..2a97b95abe54db3a0e2c4e19032e9bc11fd9697d 100644
--- a/app/components/SimpleEditor/config.js
+++ b/app/components/SimpleEditor/config.js
@@ -12,8 +12,9 @@ import {
   SubscriptPackage,
   SuperscriptPackage,
   SwitchTextTypePackage,
-  SpellCheckPackage,
-  CodeblockPackage
+  SpellCheckPackage
+  // ListPackage
+  // CodeblockPackage
 } from 'substance'
 
 // My Elements
@@ -48,15 +49,15 @@ let config = {
     config.import(CodePackage)
     config.import(PersistencePackage)
 
+    // config.import(CodeblockPackage)
+    config.import(CommentPackage)
+    config.import(ExtractPackage)
+    config.import(ImagePackage)
     config.import(LinkPackage)
-    config.import(SpellCheckPackage)
     config.import(ListPackage)
-    config.import(CodeblockPackage)
-    config.import(ExtractPackage)
     config.import(NotePackage)
     config.import(SourceNotePackage)
-    config.import(ImagePackage)
-    config.import(CommentPackage)
+    config.import(SpellCheckPackage)
     config.import(TrackChangePackage)
   }
 }
diff --git a/app/components/SimpleEditor/panes/Comments/CommentBox.js b/app/components/SimpleEditor/panes/Comments/CommentBox.js
index 453c569bb1b8bc61d384ae118e51dcb2a9d0794e..8e9fa86798ce430340c6295af51038134395acc2 100644
--- a/app/components/SimpleEditor/panes/Comments/CommentBox.js
+++ b/app/components/SimpleEditor/panes/Comments/CommentBox.js
@@ -15,8 +15,7 @@ class CommentBox extends Component {
 
   // TODO -- fix class names
   render ($$) {
-    const {active, entry} = this.props
-
+    const { active, entry } = this.props
     let comments = this.props.comments.data
 
     if (!active) {
diff --git a/app/components/SimpleEditor/panes/Comments/CommentsProvider.js b/app/components/SimpleEditor/panes/Comments/CommentsProvider.js
index ebf24032e3324101ee5804348175b694368e3cec..e013645f0f29e5efb34af5e06c674651a5c839e4 100644
--- a/app/components/SimpleEditor/panes/Comments/CommentsProvider.js
+++ b/app/components/SimpleEditor/panes/Comments/CommentsProvider.js
@@ -67,6 +67,7 @@ class CommentsProvider extends TocProvider {
 
   // runs when document session is updated
   updateActiveEntry () {
+    console.log('updateActiveEntry')
     const activeEntry = this.getActiveEntry()
     const selectionContainsComments = this.selectionContainsComments()