fixed stuff
fixing still