improve all the things

so much better