Remove some debug lines.
Expand the comment tools to work with the sidebar editor.