Fix a silly bug in parser; generally improve the parser