Various updates to sound functions