Phase 2 - Texts and fixes