Fixed everything that was brought up
Final fix
Final fix