More command fixes
Move elements to scores