More tweaking.

Directly adjacent windows will now be merged.
Furthermore the peak and trough tracker now adds one
more sample to the right. Also the instantaneous peak
and trough detector has been disabled. It is not hard
to control and not really necessary. Will likely be
removed soon.