Phase 2 changes

big fixes