hacking around bugs
fixed merge
things are working
added frequency slice