Revert "Revert "Massive Bugfixes and Improvements and New Features""

This reverts commit 3d8de2245599eb6bbcbaa9d84a41a8a318775e9c.