Fix matching comments
Improve Lexer test
Typo
main file