That's what I said. Up the crit range to a max of 25%, or 16, fix remarkable athlete to full proficiency, and instead of the extra fighting style, which equates to everyone taking +1 AC anyway, allow a choice of a flat +1 AC or +1 to hit and damage, like an expert of arms or armor kinda thing...