working on the shortcut logic; this will be an ongoing process but this ...

...logic seems one better than old; Issue #265