fixed, but need to fix Binop and Relop combinators