diff --git a/server/main.py b/server/main.py
index 31a7708..50be8ec 100644
--- a/server/main.py
+++ b/server/main.py
@@ -26,7 +26,7 @@ class MainLoop:
 
 			if refetch == 0:
 				self.controller.time()
-				Departure.fetch(self.stop_id, 10)
+				Departure.fetch(self.stop_id, 20)
 			
 			refetch = (refetch + 1) % 3
 			regenerate = (regenerate + 1) % (6*30)
@@ -42,19 +42,19 @@ class MainLoop:
 			print("> ", end="")
 			command = input()
 
-			if command == "d":
-				print("")
+			if command in ["d", "dep", "departures"]:
 				for did in Departure.storage:
 					print(Departure.storage[did])
-				print("")
+				if len(Departure.storage) == 0:
+					print("No loaded departures")
 
-			if command == "q":
-				print("")
+			if command in ["q", "queue"]:
 				for m in self.controller.message_pool:
 					print(m)
-				print("")
+				if len(self.controller.message_pool) == 0:
+					print("No messages in queue")
 
-			if command == "s":
+			if command in ["s", "stop"]:
 				print("Stopping...")
 				self.ended = True
 				self.controller.message_pool = []