Fix typo and add some shortcuts