Fix user graduation range

Apparently a rule was not what I was told.
Fix pregame logic
Merge branch 'master' into final