demo db and a couple of fixes/changes
Merge pull request #26 from protherj/qa-4

demo db and a couple of fixes/changes