some more refactorings, fixed docs, removed sf2.0