Major edits and clean up for workshop.