parser, more fixes