Bug fix-only wavs now import to list. Other code cleanup.