Index: tools/vscode/uwaterloo.cforall-0.1.0/client/main.js
===================================================================
--- tools/vscode/uwaterloo.cforall-0.1.0/client/main.js	(revision b52abe09e566fb9c0f5bb6ff0da4ce67bdd511bb)
+++ tools/vscode/uwaterloo.cforall-0.1.0/client/main.js	(revision ed120519ce9dc874dcb027c5f33d22ca92e4017d)
@@ -23,8 +23,8 @@
 	// Otherwise the run options are used
 	let serverOptions = {
-		run: { command: 'cfa-ls', transport: vscode_lc.TransportKind.ipc },
+		run: { command: 'cfa-ls', transport: vscode_lc.TransportKind.stdio },
 		debug: {
 			command: 'cfa-ls',
-			transport: vscode_lc.TransportKind.ipc,
+			transport: vscode_lc.TransportKind.stdio,
 			options: debugOptions
 		}
@@ -32,12 +32,13 @@
 
 	// Options to control the language client
+	let selector = [{ scheme: 'file', language: 'cforall' }];
 	let clientOptions = {
-		// Register the server for plain text documents
-		documentSelector: [{ scheme: 'file', language: 'cforall' }]
+		// Register the server for cforall documents
+		documentSelector: selector
 	};
 
 	// Create the language client and start the client.
 	client = new vscode_lc.LanguageClient(
-		'CforallServer',
+		'cforall',
 		'Cforall Language Server',
 		serverOptions,
Index: tools/vscode/uwaterloo.cforall-0.1.0/package.json
===================================================================
--- tools/vscode/uwaterloo.cforall-0.1.0/package.json	(revision b52abe09e566fb9c0f5bb6ff0da4ce67bdd511bb)
+++ tools/vscode/uwaterloo.cforall-0.1.0/package.json	(revision ed120519ce9dc874dcb027c5f33d22ca92e4017d)
@@ -43,15 +43,26 @@
 				"path": "./syntaxes/cfa.tmLanguage.json"
 			}
-		]
-	},
-	"configuration": {
-		"type": "object",
-		"title": "Example configuration",
-		"properties": {
-			"languageServerExample.maxNumberOfProblems": {
-				"scope": "resource",
-				"type": "number",
-				"default": 100,
-				"description": "Controls the maximum number of problems produced by the server."
+		],
+		"configuration": {
+			"type": "object",
+			"title": "Example configuration",
+			"properties": {
+				"cforall.maxNumberOfProblems": {
+					"scope": "resource",
+					"type": "number",
+					"default": 100,
+					"description": "Controls the maximum number of problems produced by the server."
+				},
+				"cforall.trace.server": {
+					"scope": "window",
+					"type": "string",
+					"enum": [
+						"off",
+						"messages",
+						"verbose"
+					],
+					"default": "off",
+					"description": "Traces the communication between VS Code and the language server."
+				}
 			}
 		}