Minor Changes and Bug fixes