Corrected all errors