More improvements, some refactoring and better docs