minor tweaks; pair programming