changes after code review + more docu