Fixing a few bugs, parser is now working.