fixed stuff
done