start to update to new grammar
Merge remote-tracking branch 'origin/master'
ported everything except plugHat