Fixing some stuff, breaking others :D