update some shortcuts
merge