Fixing the stuff I wrecked on my side

Everything should be pristine, and my name is on it