Fixed a few bugs but I don't even know