expanded rescoreAssignment(), fixed grade/weight bugs