Revert "Revert "einige Änderungen + codereste""

This reverts commit 47fb8c0c9bae9ced2a5af800a9c085cd682d628c.