cmv and a few things I changed but forgot to commit