Fixed an allocation bug and fixed the parser... kind of.