Fixed database-upgrade issues, merged configs
Merge pull request #8 from qwertyzzz18/database-fix

Database fix and config improvements