Misc. cleanup, deparameterize fuzz, reimplement smoothing