minor tweaks as I go through