diff --git a/.circleci/do-firesim-build.sh b/.circleci/do-firesim-build.sh
index ecb965b2..5eb42e56 100755
--- a/.circleci/do-firesim-build.sh
+++ b/.circleci/do-firesim-build.sh
@@ -15,7 +15,6 @@ trap clean EXIT
 
 cd $LOCAL_CHIPYARD_DIR
 ./scripts/init-submodules-no-riscv-tools.sh
-cd sims/firesim/sim/midas && git submodule update --init
 
 # set stricthostkeychecking to no (must happen before rsync)
 run "echo \"Ping $SERVER\""
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
new file mode 100644
index 00000000..4da4667e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,23 @@
+---
+name: Bug Report
+about: Report a problem with Chipyard
+labels: bug
+
+---
+
+<!-- choose one -->
+**Impact**: rtl | software | unknown | other
+
+**What is the current behavior?**
+
+**What is the expected behavior?**
+
+**Please tell us about your environment:**
+<!--    (examples)
+    - version: `chipyard git commit hash`
+    - os: `Linux knight 4.4.0-92-generic #115-Ubuntu SMP Thu Aug 10 09:04:33 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux`
+    - other: `prior steps taken/documentation followed/...`
+-->
+
+**Other information**
+<!-- include detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, ... -->
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
new file mode 100644
index 00000000..70e2081d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -0,0 +1,13 @@
+---
+name: Feature Request
+about: Propose a change to Chipyard
+
+---
+
+<!-- choose one -->
+**Impact**: rtl | software | unknown | other
+
+**Description**
+<!-- include detailed explanation, related issues, links for us to have context, ... -->
+
+**What is a motivating example for changing the behavior?**
diff --git a/.github/ISSUE_TEMPLATE/other.md b/.github/ISSUE_TEMPLATE/other.md
new file mode 100644
index 00000000..b41a5e5c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/other.md
@@ -0,0 +1,6 @@
+---
+name: Other
+about: Something else!
+
+---
+
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 00000000..b8c3f482
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,13 @@
+---
+name: Question
+about: Ask a question
+labels: question
+
+---
+
+<!-- have you looked at the Chipyard documentation? -->
+<!-- have you looked at the subproject documentation/githubs? -->
+<!-- for example: -->
+<!--   rocketchip: https://github.com/chipsalliance/rocket-chip/issues -->
+<!--   boom: https://github.com/riscv-boom/riscv-boom/issues -->
+<!--   firesim: https://github.com/firesim/firesim/issues -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..4949e777
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,10 @@
+**Related issue**: <!-- if applicable -->
+
+<!-- choose one -->
+**Type of change**: bug fix | new feature | other enhancement
+
+<!-- choose one -->
+**Impact**: rtl change | software change | unknown | other
+
+**Release Notes**
+<!-- Text from here to the end of the body will be considered for inclusion in the release notes for the version containing this pull request. -->
diff --git a/tools/barstools b/tools/barstools
index 26096e07..3bba55cc 160000
--- a/tools/barstools
+++ b/tools/barstools
@@ -1 +1 @@
-Subproject commit 26096e07f6ce3e12b2114132c2859ef56fb0cfaf
+Subproject commit 3bba55ccc89518ddeb3ed78774dd6e68d938c07a