Bugfixes, semi supervised step done in a better order