improve doku
manual merge + docu