Mostly Small Changes

And they're all mostly unrelated. This isn't too important.