some code cleanup

fixed shortcut detection

merge

carrerashark minor changes

(0) -30 -10 -4 +4 +10 +30 +100 tip

mercurial