Fix a off-by-one bug in the new difficulty code.
Merge branch 'better-difficulty' into develope