minor tweaks including comments