fixed totally incorrect cv
fixed more broken cv problems...