Many More Bugfixes and Formatting