worked on sounds, scores, and menuing
fixed merge conflicts