Fix for potential bug in target selection for combat, and expanded/fixed range of possible resting locations.