fixed possible problem with combo calculation in arcade mode
some fixes that I did in 2d
Merge branch 'master' into 2d