More edits and tweaks.