I'm really bad at doing one thing in liveupdate pull requests.

I'm sorry, this is kinda a hodgepodge of stuff. See individual commits for more info.

:eyeglasses: @umbrae @Deimos