Improved many lexer and parser rules.
Almost done