Use the sounds module, some other minor improvements