Fixed a bunch of small things