Just a few more changes to cross val