Added several things to facilitate automatic selections and scoring.