Corrected all mistakes now