diff --git a/.vscodeignore b/.vscodeignore
index e20ed77..feabe62 100644
--- a/.vscodeignore
+++ b/.vscodeignore
@@ -2,4 +2,7 @@
 .vscode/
 .github/
 node_modules/
-.gitignore
\ No newline at end of file
+.gitignore
+releases/*
+package.sh
+package.py
\ No newline at end of file
diff --git a/mcnp-server/lib/gov.lanl.mcnp-1.0.0-SNAPSHOT.jar b/mcnp-server/lib/gov.lanl.mcnp-1.0.0-SNAPSHOT.jar
index ce63fbc..1a8b91f 100644
Binary files a/mcnp-server/lib/gov.lanl.mcnp-1.0.0-SNAPSHOT.jar and b/mcnp-server/lib/gov.lanl.mcnp-1.0.0-SNAPSHOT.jar differ
diff --git a/mcnp-server/lib/gov.lanl.mcnp.ide-1.0.0-SNAPSHOT.jar b/mcnp-server/lib/gov.lanl.mcnp.ide-1.0.0-SNAPSHOT.jar
index 4f00800..cd2af86 100644
Binary files a/mcnp-server/lib/gov.lanl.mcnp.ide-1.0.0-SNAPSHOT.jar and b/mcnp-server/lib/gov.lanl.mcnp.ide-1.0.0-SNAPSHOT.jar differ
diff --git a/mcnp.tmLanguage.json b/mcnp.tmLanguage.json
index 959f790..ffe8705 100644
--- a/mcnp.tmLanguage.json
+++ b/mcnp.tmLanguage.json
@@ -51,7 +51,7 @@
 			[
                 {					
 					"name": "comment.line.double-slash.mcnp",
-					"match": "(\\$)(.*)",
+					"match": "((\\$)(.*))|((?<=[fF][cC]\\d+).*)|((?<=[sS][cC]\\d+).*)|((?<=[cC][oO][mM][mM][eE][nN][nT][=]).*)",
 					"contentName": "comment.sl.mcnp"								
 				}          
             ]
diff --git a/package.json b/package.json
index f5b6d57..226cfac 100644
--- a/package.json
+++ b/package.json
@@ -1,301 +1,301 @@
 {
-	"name": "nucomp-mcnp",
-	"displayName": "MCNP Language Server",
-	"description": "MCNP input validation and editor services. Also supports plot and run scripts.",
-	"version": "0.0.7",
-	"featureFlags": {
-		"usingNewPythonInterpreterPathApi": true,
-		"usingNewPythonInterpreterPathApiV2": true
-	},
-	"publisher": "NuCoMP",
-	"icon": "images/logo.png",
-	"engines": {
-		"vscode": "^1.56.0"
-	},
-	"categories": [
-		"Programming Languages",
-		"Other"
-	],
-	"keywords": [
-		"mcnp"
-	],
-	"repository": {
-		"type": "git",
-		"url": "https://github.rpi.edu/NuCoMP/mcnp-language-server-vscode"
-	},
-	"activationEvents": [
-		"onLanguage:mcnp",
-		"onCommand:nucomp-mcnp.run",
-		"onCommand:nucomp-mcnp.runPlotCommand"
-	],
-	"main": "./out/extension",
-	"contributes": {
-		"commands": [
-			{
-				"command": "nucomp-mcnp.run",
-				"title": "MCNP: Run",
-				"icon": {
-					"light": "./images/run-light.svg",
-					"dark": "./images/run-dark.svg"
-				}
-			},
-			{
-				"command": "nucomp-mcnp.runPlotCommand",
-				"title": "MCNP: Plot Geometry",
-				"icon": {
-					"light": "./images/cube_lgt.svg",
-					"dark": "./images/cube_drk.svg"
-				}
-			},
-			{
-				"command": "nucomp-mcnp.stop",
-				"title": "Stop Code Run",
-				"icon": {
-					"light": "./images/stop-light.svg",
-					"dark": "./images/stop-dark.svg"
-				}
-			}
-		],
-		"keybindings": [
-			{
-				"command": "nucomp-mcnp.run",
-				"key": "ctrl+alt+n"
-			},
-			{
-				"command": "nucomp-mcnp.runPlotCommand",
-				"key": "ctrl+alt+k"
-			},
-			{
-				"command": "nucomp-mcnp.stop",
-				"key": "ctrl+alt+m"
-			}
-		],
-		"menus": {
-			"editor/context": [
-				{
-					"when": "!inOutput && config.nucomp-mcnp.showRunCommandInEditorContextMenu",
-					"command": "nucomp-mcnp.run",
-					"group": "navigation"
-				},
-				{
-					"when": "!inOutput && config.nucomp-mcnp.showRunCommandInEditorContextMenu",
-					"command": "nucomp-mcnp.runPlotCommand",
-					"group": "navigation"
-				},
-				{
-					"when": "inOutput && !config.nucomp-mcnp.runInTerminal",
-					"command": "nucomp-mcnp.stop",
-					"group": "stop-code-run"
-				}
-			],
-			"editor/title/run": [
-				{
-					"when": "config.nucomp-mcnp.showRunIconInEditorTitleMenu",
-					"command": "nucomp-mcnp.run",
-					"group": "navigation"
-				}
-			],
-			"editor/title": [
-				{
-					"when": "config.nucomp-mcnp.showStopIconInEditorTitleMenu && nucomp-mcnp.codeRunning",
-					"command": "nucomp-mcnp.stop",
-					"group": "navigation"
-				},
-				{
-					"when": "config.nucomp-mcnp.showRunIconInEditorTitleMenu",
-					"command": "nucomp-mcnp.runPlotCommand",
-					"group": "navigation"
-				}
-			],
-			"explorer/context": [
-				{
-					"when": "!explorerResourceIsFolder && config.nucomp-mcnp.showRunCommandInExplorerContextMenu",
-					"command": "nucomp-mcnp.run",
-					"group": "navigation"
-				},
-				{
-					"when": "!explorerResourceIsFolder && config.nucomp-mcnp.showRunCommandInExplorerContextMenu",
-					"command": "nucomp-mcnp.runPlotCommand",
-					"group": "navigation"
-				}
-			]
-		},
-		"configuration": {
-			"type": "object",
-			"title": "Run Code configuration",
-			"properties": {
-				"nucomp-mcnp.CustomRunCommand": {
-					"type": "string",
-					"default": "",
-					"description": "Set the RUN command.",
-					"scope": "resource"
-				},
-				"nucomp-mcnp.CustomPlotCommand": {
-					"type": "string",
-					"default": "",
-					"description": "Set the PLOT command.",
-					"scope": "resource"
-				},
-				"nucomp-mcnp.executable": {
-					"type": "string",
-					"default": "",
-					"description": "Set the MCNP executable.",
-					"scope": "resource"
-				},
-				"nucomp-mcnp.xsdir": {
-					"type": "string",
-					"default": "",
-					"description": "Set the MCNP XS directory.",
-					"scope": "resource"
-				},
-				"nucomp-mcnp.run_args": {
-					"type": "string",
-					"default": "",
-					"description": "Set additional run arguments.",
-					"scope": "resource"
-				},
-				"nucomp-mcnp.plot_args": {
-					"type": "string",
-					"default": "",
-					"description": "Set additional plot arguments.",
-					"scope": "resource"
-				},
-				"nucomp-mcnp.languageIdToFileExtensionMap": {
-					"type": "object",
-					"default": {
-						"mcnp": ".mcnp"
-					},
-					"description": "Set the mapping of languageId to file extension.",
-					"scope": "resource"
-				},
-				"nucomp-mcnp.defaultLanguage": {
-					"type": "string",
-					"default": "mcnp",
-					"description": "Set the default language to run.",
-					"scope": "resource"
-				},
-				"nucomp-mcnp.cwd": {
-					"type": "string",
-					"default": "",
-					"description": "Set the working directory.",
-					"scope": "resource"
-				},
-				"nucomp-mcnp.fileDirectoryAsCwd": {
-					"type": "boolean",
-					"default": false,
-					"description": "Whether to use the directory of the file to be executed as the working directory.",
-					"scope": "resource"
-				},
-				"nucomp-mcnp.clearPreviousOutput": {
-					"type": "boolean",
-					"default": false,
-					"description": "Whether to clear previous output before each run.",
-					"scope": "resource"
-				},
-				"nucomp-mcnp.saveAllFilesBeforeRun": {
-					"type": "boolean",
-					"default": false,
-					"description": "Whether to save all files before running.",
-					"scope": "resource"
-				},
-				"nucomp-mcnp.saveFileBeforeRun": {
-					"type": "boolean",
-					"default": false,
-					"description": "Whether to save the current file before running.",
-					"scope": "resource"
-				},
-				"nucomp-mcnp.showExecutionMessage": {
-					"type": "boolean",
-					"default": true,
-					"description": "Whether to show extra execution message like [Running] ... and [Done] ...",
-					"scope": "resource"
-				},
-				"nucomp-mcnp.runInTerminal": {
-					"type": "boolean",
-					"default": true,
-					"description": "Whether to run code in Integrated Terminal.",
-					"scope": "resource"
-				},
-				"nucomp-mcnp.terminalRoot": {
-					"type": "string",
-					"default": "",
-					"description": "For Windows system, replaces the Windows style drive letter in the command with a Unix style root when using a custom shell as the terminal, like Bash or Cgywin. Example: Setting this to '/mnt/' will replace 'C:\\path' with '/mnt/c/path'",
-					"scope": "resource"
-				},
-				"nucomp-mcnp.preserveFocus": {
-					"type": "boolean",
-					"default": true,
-					"description": "Whether to preserve focus on code editor after code run is triggered.",
-					"scope": "resource"
-				},
-				"nucomp-mcnp.ignoreSelection": {
-					"type": "boolean",
-					"default": true,
-					"description": "Whether to ignore selection to always run entire file.",
-					"scope": "resource"
-				},
-				"nucomp-mcnp.showRunIconInEditorTitleMenu": {
-					"type": "boolean",
-					"default": true,
-					"description": "Whether to show 'MCNP: Run' icon in editor title menu.",
-					"scope": "resource"
-				},
-				"nucomp-mcnp.showStopIconInEditorTitleMenu": {
-					"type": "boolean",
-					"default": true,
-					"description": "Whether to show 'Stop code run' icon in the editor title menu when code is running.",
-					"scope": "resource"
-				},
-				"nucomp-mcnp.showRunCommandInEditorContextMenu": {
-					"type": "boolean",
-					"default": true,
-					"description": "Whether to show 'MCNP: Run' command in editor context menu.",
-					"scope": "resource"
-				},
-				"nucomp-mcnp.showRunCommandInExplorerContextMenu": {
-					"type": "boolean",
-					"default": true,
-					"description": "Whether to show 'MCNP: Run' command in explorer context menu.",
-					"scope": "resource"
-				},
-				"nucomp-mcnp.temporaryFileName": {
-					"type": "string",
-					"default": "temp_mcnp_file",
-					"description": "Temporary file name used in running selected code snippet. When it is set as empty, the file name will be random.",
-					"scope": "resource"
-				}
-			}
-		},
-		"languages": [
-			{
-				"id": "mcnp",
-				"aliases": [
-					"mcnp"
-				],
-				"extensions": [
-					".mcnp"
-				],
-				"configuration": "./mcnp.configuration.json"
-			}
-		],
-		"grammars": [
-			{
-				"language": "mcnp",
-				"scopeName": "source.mcnp",
-				"path": "./mcnp.tmLanguage.json"
-			}
-		]
-	},
-	"scripts": {
-		"vscode:prepublish": "npm run esbuild-base -- --minify",
-		"esbuild-base": "esbuild ./src/extension.js --bundle --outfile=out/extension.js --external:vscode --format=cjs --platform=node",
-		"esbuild": "npm run esbuild-base -- --sourcemap",
-		"esbuild-watch": "npm run esbuild-base -- --sourcemap --watch",
-		"test-compile": "tsc -p ./"
-	},
-	"dependencies": {
-		"esbuild": "^0.14.39",
-		"tree-kill": "^1.2.2",
-		"vscode-languageclient": "^7.0.0"
-	}
-}
+    "name": "nucomp-mcnp",
+    "displayName": "MCNP Language Server",
+    "description": "MCNP input validation and editor services. Also supports plot and run scripts.",
+    "version": "0.0.8",
+    "featureFlags": {
+        "usingNewPythonInterpreterPathApi": true,
+        "usingNewPythonInterpreterPathApiV2": true
+    },
+    "publisher": "NuCoMP",
+    "icon": "images/logo.png",
+    "engines": {
+        "vscode": "^1.56.0"
+    },
+    "categories": [
+        "Programming Languages",
+        "Other"
+    ],
+    "keywords": [
+        "mcnp"
+    ],
+    "repository": {
+        "type": "git",
+        "url": "https://github.rpi.edu/NuCoMP/mcnp-language-server-vscode"
+    },
+    "activationEvents": [
+        "onLanguage:mcnp",
+        "onCommand:nucomp-mcnp.run",
+        "onCommand:nucomp-mcnp.runPlotCommand"
+    ],
+    "main": "./out/extension",
+    "contributes": {
+        "commands": [
+            {
+                "command": "nucomp-mcnp.run",
+                "title": "MCNP: Run",
+                "icon": {
+                    "light": "./images/run-light.svg",
+                    "dark": "./images/run-dark.svg"
+                }
+            },
+            {
+                "command": "nucomp-mcnp.runPlotCommand",
+                "title": "MCNP: Plot Geometry",
+                "icon": {
+                    "light": "./images/cube_lgt.svg",
+                    "dark": "./images/cube_drk.svg"
+                }
+            },
+            {
+                "command": "nucomp-mcnp.stop",
+                "title": "Stop Code Run",
+                "icon": {
+                    "light": "./images/stop-light.svg",
+                    "dark": "./images/stop-dark.svg"
+                }
+            }
+        ],
+        "keybindings": [
+            {
+                "command": "nucomp-mcnp.run",
+                "key": "ctrl+alt+n"
+            },
+            {
+                "command": "nucomp-mcnp.runPlotCommand",
+                "key": "ctrl+alt+k"
+            },
+            {
+                "command": "nucomp-mcnp.stop",
+                "key": "ctrl+alt+m"
+            }
+        ],
+        "menus": {
+            "editor/context": [
+                {
+                    "when": "!inOutput && config.nucomp-mcnp.showRunCommandInEditorContextMenu",
+                    "command": "nucomp-mcnp.run",
+                    "group": "navigation"
+                },
+                {
+                    "when": "!inOutput && config.nucomp-mcnp.showRunCommandInEditorContextMenu",
+                    "command": "nucomp-mcnp.runPlotCommand",
+                    "group": "navigation"
+                },
+                {
+                    "when": "inOutput && !config.nucomp-mcnp.runInTerminal",
+                    "command": "nucomp-mcnp.stop",
+                    "group": "stop-code-run"
+                }
+            ],
+            "editor/title/run": [
+                {
+                    "when": "config.nucomp-mcnp.showRunIconInEditorTitleMenu",
+                    "command": "nucomp-mcnp.run",
+                    "group": "navigation"
+                }
+            ],
+            "editor/title": [
+                {
+                    "when": "config.nucomp-mcnp.showStopIconInEditorTitleMenu && nucomp-mcnp.codeRunning",
+                    "command": "nucomp-mcnp.stop",
+                    "group": "navigation"
+                },
+                {
+                    "when": "config.nucomp-mcnp.showRunIconInEditorTitleMenu",
+                    "command": "nucomp-mcnp.runPlotCommand",
+                    "group": "navigation"
+                }
+            ],
+            "explorer/context": [
+                {
+                    "when": "!explorerResourceIsFolder && config.nucomp-mcnp.showRunCommandInExplorerContextMenu",
+                    "command": "nucomp-mcnp.run",
+                    "group": "navigation"
+                },
+                {
+                    "when": "!explorerResourceIsFolder && config.nucomp-mcnp.showRunCommandInExplorerContextMenu",
+                    "command": "nucomp-mcnp.runPlotCommand",
+                    "group": "navigation"
+                }
+            ]
+        },
+        "configuration": {
+            "type": "object",
+            "title": "Run Code configuration",
+            "properties": {
+                "nucomp-mcnp.CustomRunCommand": {
+                    "type": "string",
+                    "default": "",
+                    "description": "Set the RUN command.",
+                    "scope": "resource"
+                },
+                "nucomp-mcnp.CustomPlotCommand": {
+                    "type": "string",
+                    "default": "",
+                    "description": "Set the PLOT command.",
+                    "scope": "resource"
+                },
+                "nucomp-mcnp.executable": {
+                    "type": "string",
+                    "default": "",
+                    "description": "Set the MCNP executable.",
+                    "scope": "resource"
+                },
+                "nucomp-mcnp.xsdir": {
+                    "type": "string",
+                    "default": "",
+                    "description": "Set the MCNP XS directory.",
+                    "scope": "resource"
+                },
+                "nucomp-mcnp.run_args": {
+                    "type": "string",
+                    "default": "",
+                    "description": "Set additional run arguments.",
+                    "scope": "resource"
+                },
+                "nucomp-mcnp.plot_args": {
+                    "type": "string",
+                    "default": "",
+                    "description": "Set additional plot arguments.",
+                    "scope": "resource"
+                },
+                "nucomp-mcnp.languageIdToFileExtensionMap": {
+                    "type": "object",
+                    "default": {
+                        "mcnp": ".mcnp"
+                    },
+                    "description": "Set the mapping of languageId to file extension.",
+                    "scope": "resource"
+                },
+                "nucomp-mcnp.defaultLanguage": {
+                    "type": "string",
+                    "default": "mcnp",
+                    "description": "Set the default language to run.",
+                    "scope": "resource"
+                },
+                "nucomp-mcnp.cwd": {
+                    "type": "string",
+                    "default": "",
+                    "description": "Set the working directory.",
+                    "scope": "resource"
+                },
+                "nucomp-mcnp.fileDirectoryAsCwd": {
+                    "type": "boolean",
+                    "default": false,
+                    "description": "Whether to use the directory of the file to be executed as the working directory.",
+                    "scope": "resource"
+                },
+                "nucomp-mcnp.clearPreviousOutput": {
+                    "type": "boolean",
+                    "default": false,
+                    "description": "Whether to clear previous output before each run.",
+                    "scope": "resource"
+                },
+                "nucomp-mcnp.saveAllFilesBeforeRun": {
+                    "type": "boolean",
+                    "default": false,
+                    "description": "Whether to save all files before running.",
+                    "scope": "resource"
+                },
+                "nucomp-mcnp.saveFileBeforeRun": {
+                    "type": "boolean",
+                    "default": false,
+                    "description": "Whether to save the current file before running.",
+                    "scope": "resource"
+                },
+                "nucomp-mcnp.showExecutionMessage": {
+                    "type": "boolean",
+                    "default": true,
+                    "description": "Whether to show extra execution message like [Running] ... and [Done] ...",
+                    "scope": "resource"
+                },
+                "nucomp-mcnp.runInTerminal": {
+                    "type": "boolean",
+                    "default": true,
+                    "description": "Whether to run code in Integrated Terminal.",
+                    "scope": "resource"
+                },
+                "nucomp-mcnp.terminalRoot": {
+                    "type": "string",
+                    "default": "",
+                    "description": "For Windows system, replaces the Windows style drive letter in the command with a Unix style root when using a custom shell as the terminal, like Bash or Cgywin. Example: Setting this to '/mnt/' will replace 'C:\\path' with '/mnt/c/path'",
+                    "scope": "resource"
+                },
+                "nucomp-mcnp.preserveFocus": {
+                    "type": "boolean",
+                    "default": true,
+                    "description": "Whether to preserve focus on code editor after code run is triggered.",
+                    "scope": "resource"
+                },
+                "nucomp-mcnp.ignoreSelection": {
+                    "type": "boolean",
+                    "default": true,
+                    "description": "Whether to ignore selection to always run entire file.",
+                    "scope": "resource"
+                },
+                "nucomp-mcnp.showRunIconInEditorTitleMenu": {
+                    "type": "boolean",
+                    "default": true,
+                    "description": "Whether to show 'MCNP: Run' icon in editor title menu.",
+                    "scope": "resource"
+                },
+                "nucomp-mcnp.showStopIconInEditorTitleMenu": {
+                    "type": "boolean",
+                    "default": true,
+                    "description": "Whether to show 'Stop code run' icon in the editor title menu when code is running.",
+                    "scope": "resource"
+                },
+                "nucomp-mcnp.showRunCommandInEditorContextMenu": {
+                    "type": "boolean",
+                    "default": true,
+                    "description": "Whether to show 'MCNP: Run' command in editor context menu.",
+                    "scope": "resource"
+                },
+                "nucomp-mcnp.showRunCommandInExplorerContextMenu": {
+                    "type": "boolean",
+                    "default": true,
+                    "description": "Whether to show 'MCNP: Run' command in explorer context menu.",
+                    "scope": "resource"
+                },
+                "nucomp-mcnp.temporaryFileName": {
+                    "type": "string",
+                    "default": "temp_mcnp_file",
+                    "description": "Temporary file name used in running selected code snippet. When it is set as empty, the file name will be random.",
+                    "scope": "resource"
+                }
+            }
+        },
+        "languages": [
+            {
+                "id": "mcnp",
+                "aliases": [
+                    "mcnp"
+                ],
+                "extensions": [
+                    ".mcnp"
+                ],
+                "configuration": "./mcnp.configuration.json"
+            }
+        ],
+        "grammars": [
+            {
+                "language": "mcnp",
+                "scopeName": "source.mcnp",
+                "path": "./mcnp.tmLanguage.json"
+            }
+        ]
+    },
+    "scripts": {
+        "vscode:prepublish": "npm run esbuild-base -- --minify",
+        "esbuild-base": "esbuild ./src/extension.js --bundle --outfile=out/extension.js --external:vscode --format=cjs --platform=node",
+        "esbuild": "npm run esbuild-base -- --sourcemap",
+        "esbuild-watch": "npm run esbuild-base -- --sourcemap --watch",
+        "test-compile": "tsc -p ./"
+    },
+    "dependencies": {
+        "esbuild": "^0.14.39",
+        "tree-kill": "^1.2.2",
+        "vscode-languageclient": "^7.0.0"
+    }
+}
\ No newline at end of file