minor tweaks to #s