Alright, fixing some stuff.