Fixed a bunch of silly things