fixed stuff
stuff