Corrected all issues