Corrected some huge mistakes