Minor tweaks for first crappy demo