finishing fixes to rater...
Phase 3 changes hav been completed