Minor Changes and bug fixes