zune media collection reset tool
the zune reset tool fixed the missing and incorrect files associated with my surround. it is a free download from microsoft. the zune software wraps itself around your computer, changes associations to itself, and has a tendency to take things over. I haven't figured out exactly what the merge with windows 7 button does, but the reset tool fixed it for now.