Fixed a bunch of silliness