Some more tweaks, output