minor cleanups of checks
make sure returned restraints have their score set, and special case 0
close #414