comments and minor tweaks