Various edits and improvements.