extcon from Peter White
major changes one comment, the rest were content edits