CV update, other minor fixes