added scikit code, changes to some other files