Fixes a bunch of broken stuff, parsing now works