Minor edits and rename.