Added a few more checks for upgradeship stuff
Think I finally nailed down the hyperjump displaying properly when used with cargo