Minor Changes and Bugfixing