diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 24b129d5f..000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,10 +0,0 @@
-### Description
-
-### Expected outcome
-
-### Actual outcome
-
-### Steps to reproduce
-
-### Version of Ranvier
-<!-- output of ./ranvier --version -->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..24753f5be
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,24 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Error logs**
+If the server produced an error paste the log here
+
+**Environment (please complete the following information):**
+ - OS: [e.g. Ubuntu 16.04]
+ - Node version
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/bundles/ranvier-websocket/server-events/wss.js b/bundles/ranvier-websocket/server-events/wss.js
index 492b9f06d..eceb0d733 100644
--- a/bundles/ranvier-websocket/server-events/wss.js
+++ b/bundles/ranvier-websocket/server-events/wss.js
@@ -13,7 +13,7 @@ module.exports = srcPath => {
     listeners: {
       startup: state => function (commander) {
         // create a new websocket server using the port command line argument
-        const wss = new WebSocket.Server({ port: 4001 });
+        const wss = new WebSocket.Server({ port: `${commander.wsPort}` });
 
         // This creates a super basic "echo" websocket server
         wss.on('connection', function connection(ws) {
diff --git a/package-lock.json b/package-lock.json
index bfc01dc5a..9195484db 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2694,7 +2694,7 @@
     },
     "minimist": {
       "version": "0.0.10",
-      "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
       "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8="
     },
     "mixin-deep": {
diff --git a/ranvier b/ranvier
index 2727d4c4e..97f8eb373 100755
--- a/ranvier
+++ b/ranvier
@@ -63,6 +63,7 @@ commander
   .option('-s, --save [time]', 'Number of seconds between auto-save ticks [10]', 10)
   .option('-r, --respawn [time]', 'Number of minutes between respawn ticks [120]', 120)
   .option('-p, --port [portNumber]', 'Port to host the server [23]', Config.get('port', 23))
+  .option('-w, --wsPort [portNumber]', 'Web socket port [4001]', Config.get('wsPort', 4001))
   .option('-v, --verbose', 'Verbose console logging.', true)
   .option('-e, --prettyErrors', 'Pretty-print formatting for error stack traces.', false)
   .parse(process.argv);
diff --git a/ranvier.json b/ranvier.json
index d30e07934..e3182182e 100644
--- a/ranvier.json
+++ b/ranvier.json
@@ -1,5 +1,6 @@
 {
   "port": 4000,
+  "wsPort": 4001,
   "bundles": [
     "ranvier-telnet",
     "ranvier-websocket",
diff --git a/src/Room.js b/src/Room.js
index 432e8cdee..6508ae520 100644
--- a/src/Room.js
+++ b/src/Room.js
@@ -403,7 +403,7 @@ class Room extends Metadatable(EventEmitter) {
     for (let [behaviorName, config] of this.behaviors) {
       let behavior = state.RoomBehaviorManager.get(behaviorName);
       if (!behavior) {
-        Logger.warn(`No script found for item behavior ${behaviorName}`);
+        Logger.warn(`No script found for room behavior ${behaviorName}`);
         continue;
       }