Better wave design and fixes.