Fixed some stuff
Changed some stuff