fixes and new parsers