Docs updated, some refactoring