Minor modifications to demo.