Many Bugfixes and Improvements in core