Fixed some stuff...other stuff broke...