Updated TargetSelector

Target selecting should work better.