DB Changes and some minor corrections