New demo, some simple demo fixes