Misc. improvements

I don't really want to go through all the changes.