fixed stuff
fixes