Fixed a few stuff.Broke few