Fixed: Incorrect smoothing before tool is active. And cleanups.