Merge `kryestofer:master` into `WLCSC:master`

This pull request has a few more commits than my previous one.