reworking the autolinking and shortcuts