parser fixes + next problem solved (easy)
small generator fix