Tool tweaks, not sure if I like them