small fixes added new grammar rules
test2 and 3 pass