Initial parser and minor lexer/token bug fixes