minor tweaks before layout