Add import option now works.  Also fixed issue with npe when adding a multiline comment.  Still need to to more work on comment syntax hilighting.