FIXED A BUNCH O STUFF