Improved targeting and damage calculations