Fixed some stuff, I think