#788: #635 #644 #748 and other edits

opened by TillmannTaape