Fixing improper logic and inject() calls
grabbing Peter's ship instance logics fixes.