Simplification of bonus sytem
Improving End game detection