Fixed a bunch of junk that was really wrong