Thunder Wave + Normalize Fixes
Merge pull request #1183 from Fuzzysqurl/twave

Thunder Wave + Normalize Fixes