Corrected some erros I had made relating to previous commit