Some minor Changes and bugfixed