Add methodParameters to grammer, misc fixes