Tweaks for mid range.
Tweaks harmonic tone pitch estimation.
Switch merit figure to found harmonic peak count over last harmonic rank biased toward increasing peak count.