Fixed a bunch of little stuff