added more is_cnv
cleanup