diff --git a/src/index.ts b/src/index.ts
index 37e94e9..ebeb7c6 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -36,11 +36,14 @@ const baseSecurityHeaders = (req: express.Request, res: express.Response, next:
 
 // simple logging middleware
 const logger = (req: express.Request, res: express.Response, next: express.NextFunction) => {
+  // if GET and /mcp, log the body returned
   console.log(`${new Date().toISOString()} ${req.method} ${req.url}`);
-  if (req.url.includes('/mcp')) {
-    console.log('  Headers:', JSON.stringify(req.headers, null, 2));
+  if (req.method === 'GET' && req.url.includes('/mcp')) {
     console.log('  Body:', JSON.stringify(req.body, null, 2));
   }
+  res.on('finish', () => {
+    console.log('  Response:', res.statusCode);
+  });
   next();
 };
 
diff --git a/src/services/mcp.ts b/src/services/mcp.ts
index 04a5e65..0f9d11d 100644
--- a/src/services/mcp.ts
+++ b/src/services/mcp.ts
@@ -674,6 +674,7 @@ export const createMcpServer = (): McpServerWrapper => {
   });
 
   const cleanup = async () => {
+    console.log("Cleaning up MCP server");
     if (subsUpdateInterval) clearInterval(subsUpdateInterval);
     if (logsUpdateInterval) clearInterval(logsUpdateInterval);
     if (stdErrUpdateInterval) clearInterval(stdErrUpdateInterval);