Smudge fix completion & related fixes - tool reset completion