diff --git a/nullptr/api.py b/nullptr/api.py
index 1d4cc8c..440e33c 100644
--- a/nullptr/api.py
+++ b/nullptr/api.py
@@ -235,7 +235,7 @@ class Api:
     return ship
     
   def shipyard(self, wp):
-    return self.request('get', f'systems/{wp.system()}/waypoints/{wp}/shipyard')
+    return self.request('get', f'systems/{wp.system}/waypoints/{wp}/shipyard')
 
   def extract(self, ship, survey=None):
     data = {}
diff --git a/nullptr/commander.py b/nullptr/commander.py
index ca3b870..c54fd40 100644
--- a/nullptr/commander.py
+++ b/nullptr/commander.py
@@ -65,6 +65,8 @@ class Commander(CommandLine):
     self.do_ships('r')
     print('=== contracts')
     self.do_contracts('r')
+    print('=== waypoints')
+    self.do_waypoints()
     self.store.flush()
     return agent
   
diff --git a/nullptr/missions/base.py b/nullptr/missions/base.py
index 3f14477..42bfc43 100644
--- a/nullptr/missions/base.py
+++ b/nullptr/missions/base.py
@@ -163,7 +163,7 @@ class BaseMission(Mission):
 
   def step_sell(self, except_resource=True):
     target = self.st('resource')
-    market = self.store.get('Marketplace', self.ship.location_str)
+    market = self.store.get('Marketplace', self.ship.location.symbol)
     sellables = market.sellable_items(self.ship.cargo.keys())
     if target in sellables and except_resource:
       sellables.remove(target)