Multiple Changes and Fixes

Multiple Changes and Fixes