Clean up and make the demos nicer