use correct basename with db suffix
Merge branch 'sqlite-db-path'
improvements to path selection
Merge branch 'sqlite-db-path'