Fixes #383. Cleans up issues around connection strings and brings clarity