more bug fixes to CNV grammar