Fixes #14. Also changes some shortcuts