improved critical & weapon focus rework