Massive Fix of parser and entities