Overall Changes and Bugfixes