fix so much stuff
moar tweaks