small fix
removing old cruft
fixed a few assorted things with cv