Global change of Parser. Fixed bugs...