Various edits

See changes.