more tweaks to outputs