FIXED A BUNCH OF STUFF