minor improves (the score problem is left)