Merge pull request #244 from Useful-Innovation/johans-fixes

db update