after merge
score fixing and other patches