General updates to the demo system.