Revert "Anpassungen und Bugfixes"

This reverts commit b21a284390bcfa620ee8babd3beb7fd64803ab0e.
Revert "Revert "Anpassungen und Bugfixes""

This reverts commit 4299ec5f56f19947abe8dec5239045e00d3ad6ac.