FIXED some stuff
FIXED some stuff again