Tweaks to sound and visual cleanup