Even more fixes. I kinda suck at one-shot kills.