Fixed lexer to deal with incorrectly formatted Comments and Block Commen...

Please merge my lexer fixes, with new tests into the main branch.