Fix item switching bug
Merge branch 'scoring' into hack-day