minor tweaks to get all the commits together