fixing stuff
still fixing