Fix some stuff to have cool "demo" available tomorrow