Some trivial improvements to the demo