more tweaks to standalone; new shield-based version