Parsing improvements. Only 3 failing tests left.