minor tweaks before branch