Fixed everything (hopefully)