fixed some stuff
fixed some stuff