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

db updated