Final fixes. Phase 1 is over.