Final tweaks before demo