and several small fixes or changes to make this easier
merged
mentioned in commit 54683e0c
This will create a new commit in order to revert the existing changes.