Added some smoothing code, and cleaned some other things up </generic commit>