Targeting

Fixed issues with range checks
fixed other map issues