More geometry drawing scoring improvements