some minor updates
Merge branch 'renameDb'