refactor comment()
fix handling of unterminated comment. Closes #24