fixing stuff
more fixing