Bug fix, 2 new parsers, style changes