Fixed everything up