simpler freqs, bugfixes