Lots of nits, and corrections