Fixed some stuff, and some things