diff --git a/nullptr/commander.py b/nullptr/commander.py
index ad3aa5a..e9beb62 100644
--- a/nullptr/commander.py
+++ b/nullptr/commander.py
@@ -54,6 +54,8 @@ class Commander(CommandLine):
   
   def all_specials(self, waypoints):
     for w in waypoints:
+      if self.stop_auto:
+        break
       if 'MARKETPLACE' in w.traits:
         self.api.marketplace(w)
         print(f'marketplace at {w}')
@@ -72,10 +74,11 @@ class Commander(CommandLine):
     self.stop_auto = False 
     data = self.api.list_systems(1)
     pages = total_pages(self.api.last_meta)
+    print(f'{pages} pages of systems')
     print(f'page {1}: {len(data)} results')
     self.all_waypoints(data)
     
-    print(f'{pages} more pages of systems')
+    
     for p in range(2, pages):
       if self.stop_auto:
         break