Some fixes to the parser. Incomplete.