Fixed some stuff, broke other stuff