Updates and fixes from review by Rochelle and Jackie for Phase 1.