diff --git a/exec/websocketservice.js b/exec/websocketservice.js
index 60e727b859260a1ef07dccafc4a96b5d71515bc8..fdcdd1c8e669676ab7685209d0d81327be6a027f 100644
--- a/exec/websocketservice.js
+++ b/exec/websocketservice.js
@@ -5,19 +5,20 @@
 // Synchronet Service for redirecting incoming WebSocket connections to the Telnet and/or RLogin server
 // Mainly to be used in conjunction with fTelnet
 
+// Command-line syntax:
+// websocketservice.js [hostname] [port]
+
 // Example configuration (in ctrl/services.ini)
 //
-// ; WebSocket to RLogin
-// [WebSocket-RLogin]
-// Port=11513
-// Options=NO_HOST_LOOKUP
-// Command=websocketservice.js localhost 513
-//
-// ; WebSocket to Telnet
-// [WebSocket-Telnet]
+// [WS]
 // Port=1123
 // Options=NO_HOST_LOOKUP
-// Command=websocketservice.js localhost 23
+// Command=websocketservice.js
+//
+// [WSS]
+// Port=11235
+// Options=NO_HOST_LOOKUP|TLS
+// Command=websocketservice.js
 
 //include definitions for synchronet
 load("nodedefs.js");
@@ -66,16 +67,18 @@ try {
             }
         } else {
             // If SysOp gave an alternate hostname/port when installing the service, use that instead
-            if (argc === 1) {
-                TargetPort = parseInt(argv[0]);
-            } else if (argc === 2) {
-                TargetHostname = argv[0];
-                TargetPort = parseInt(argv[1]);
+			for(var i in argv) {
+				var port = parseInt(argv[i], 10);
+				if(port > 0)
+					TargetPort = port;
+				else
+					TargetHostname = argv[i];
             }
         }
         
 		// Connect to the server
         FServerSocket = new Socket();
+		log(LOG_DEBUG, "Connecting to " + TargetHostname + ":" + TargetPort);
         if (FServerSocket.connect(TargetHostname, TargetPort)) {
             // Variables we'll use in the loop
             var DoYield = true;
@@ -111,7 +114,7 @@ try {
 			if (!FServerSocket.is_connected) log(LOG_DEBUG, 'Server socket no longer connected');
         } else {
             // FServerSocket.connect() failed
-            log(LOG_ERR, "Unable to connect to server at " + TargetHostname + ":" + TargetPort);
+            log(LOG_ERR, "Error " + FServerSocket.error + " connecting to server at " + TargetHostname + ":" + TargetPort);
             SendToWebSocketClient(StringToBytes("ERROR: Unable to connect to server\r\n"));
             mswait(2500);
         }