Keep generic code generic
Fix Issue #469
WWB not refreshing after buying
Merge pull request #470 from waveney/wav16

Fixes