Tweak some stuff for demo
Finished demo work