grammar nits and minor clean-up