Fix parse

Needs more tests for parse failures.