Changes a number of small things to make the demo easier