More minor tweaks before tomorrow