Fix comments including newlines
Merge branch 'working'
Fix formatting in lexer
Merge branch 'working'