fixed some stuff
Changes