Multiple Changes and Fixes