Fixed some stuff
Again