corrected so many things