Tested parser, small changes.