Improved parser handling. Also removed rewind/mark system and replaced with lookahead