Minor fixes, parser is working fine now :)