couple of demo updates/ fixes