FIXED ALL THE THINGS!!!