improve wording & tracking