Improve Lexer
Improve Lexer, Add Parser