more bug fixes to CNV grammar
Merge remote-tracking branch 'origin/master'