fixed stuff
resolved