DB Changes and bug fixes