reworked some shortcuts