Fixed big bug in SimpleDft:  'N' should have been computed.  Cleaned up waterfall code a lot.