Tool updates

I'm merging this myself, try and stop me!