Really corrected all mistakes now