minor tweaks, and a needed line-wrap