Update parser, lexer

Parser should completely work now.  Next step: output generation.