Corrected some things from the previous commit