Fixed some stuff, I guess