Various edits and additions.