Mostly fix everything broken. Mostly.