Some Changes and Fixes