Docu added, some minor refactorings and renamings