Clean up multi-monitor support, extend demo.