few grammar constructs added