More refinements from running through demo 1