Fixed error with grammar parsing
Added some primitives for evaluation