Fix everything

Jeremy helped*

* He did most of it.