have made various changes to reflect commits of doc at meeting