Spiffied around some stuff

Need to fix a problem where the target location is off for Craft
location from NPCship firing