updated Docu
some refactoring