migrated to new db
Ran findbugs and corrected errors