some code cleanup

fixed shortcut detection

merge

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

mercurial