Add comments + fix cross-validation bug