Phase 2 finishes and tweaks