Fixed some stuff for the demo