fixes and stuff
cleaning up