rename Status->Phase, more cosmetic fixes