minor tweaks before merge