Fixed everything woohoo