Mostly just cleanup work.  Added ModuleWaveshaper, but I have my doubts that it is working correctly.  I'll be reaserhing this more later.