fixing stuff
more fixes