parser fixes and half of the controller method