master terms-improvements