Fixed all Parsers