small tweaks
Merge branch 'databaseedits'