refactored grammar
added full rhs parser