PARSER FIXES, HURRAY!