Final cleanup and additions for the demo.