Much needed cleanup + fixing shit.