Various edits made by Chris R after the initial push.