Allow non-numeric rank
Allow ranking by code
Fix ShipGoal