Add logging, minor fixes to demo data