Improved some term settings