minor tweaks before merging all work