fixed some stuff
?