Modifications to o2jam scoring, again.