Fixed everything hehehe