fix stuff
fix merge conflicts; add scores; transitions