first
added mayer wave component
refactored fft
Merge branch 'mayer'
some parameter tweaks