features updated and test code for x-validation