Yet more edits and whatnot.