Fix big wheel and scratch off.
Merge branch 'dev'