Incorporated most of Rick's suggested changes for orglake chapter