Make various changes. Good thing I'm a lone developer, because commits like this one are terrible practice...