Tweaks and typos.