fixing parser.. pending lexer fix