Extra sprucing of the demo