changes in db
minor bug fixes
Merge branch 'sjain7'