several changes

I started to hack on wavetuner but my progress was slow and this is all I produced.. please have a look at these changes anyway, and maybe you can help me with the feature request I'm going to post afterwards ;)