worked on score rendering
fixed merge conflicts again