Freq2Pitch improved