TargetID tweaks

Just like it says