AVALANCHE: uncomment some sound code, code cleanup