adds close combat, fixes rotations issues