number tweaks from jeffd (master)