In addition to that, I feel that a good combat update would be to make it so if you attack three times, he doesn't put the gun down after every shot, but rather consecutive shots.
