fixed stuff
testing