renamed stuff, small fixes
addded more thing to cv