Sprint2 cleanup

[jessehartloff]

Proposed changes

---

Cleanup merge in preparation for Spring 2 demo. Mostly minor fixes and updates

Types of changes

---

What types of changes does your code introduce?
Put an x in the boxes that apply

• [ x ] Bugfix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to not work as expected)
• [ x ] Documentation Update (if none of the other choices apply)

Checklist

---

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of
them, don't hesitate to ask. This is simply a reminder of what we are going to look for before merging your code.

• [ x ] My changeset covers only what is described above (no extraneous changes)
• Lint and unit tests pass locally with my changes
• I have added tests that prove my fix is effective or that my feature works
• I have added necessary documentation (if appropriate)