Update the parser.

Closes #209
Closes #180