Improved ALL the things (somewhat)