fixed and improved sound
merged