Last minute changes for the demo - including the fix for the infamous no "expose" event on laptop