minor tweaks, mostly affecting output