Fixes handling of lines only containing multiline comments
Implements better comment handling

Now also finds source comments within lines