demo db and a couple of fixes/changes