Clean up and fix timing of sound