Corrected other mistakes