some bugfixes within the parser