Fixed everything, 2 more things to do