fixes to parser, integration with buddy and integration tests