Updates from Gary

Review and updates from me.