Some Changes and Patches