More bug fixes, mostly with the parser.