inserted all tested changes again after reset to master
the merge conflict chaos was too hard ;-(