Minor clean-up and parameter name changes.
Save and restore FFT averaging setting.
Remove trivial debug message.