Fixing parser
More parser fixes
Merged succesfully, maybe
Remove bad things