cleanup
fix and test for multiline comment handling