Fixed everything that was broken
Un broke again