Corrected all mistakes