Updated DemoData set and functionality, solved 2 bugs discoverd during testing by Apple