tweaks with jeffd (master)