Battle Mastery: The variable, resetting duration limit is unnecessary - even a 1st-level fighter can generally be counted on to hit at least once every four rounds, so this ability will nearly always last until the end of the encounter. Skip the number-tracking and the math and just state that it lasts until the end of the encounter.