Bugfixes and several Changes