Fixed some stuff
Fixed some stuff