Add Ice's 7wave stuff.  Still missing a bunch.
Run 7waves through the fixer for aisu. Fixed a few issues.