added support for database options and some consistancy in env variable naming