Fixed targetless compatibility and updated the ship and object targeting text
Merge upstream changes