Fixed another bug in parser & fixed up baselines