minor tweaks after doing some testing