Fixed everything we couldn't before
Done
Done
Done