#782: #677 #767 #669 and misc edits

opened by TillmannTaape