fixed some stuff
fixed more stuff