bug fixes on new parsers, tests passing now