Mostly minor fixes/corrections.