A collection of important and unimportant fixes and changes

**Resolves issues #723 and #707, as well as several things that I didn't get the chance to create issues for.**