Added all sounds, tweaked sound parade
merge