Bugfixes and more Code cleanup