Lexer ordering bug fixed, comments now generated