Fixed: Some Bugfixes