Fixed a parsing bug, and made stringification much better