Fixed a bunch stuff