export - minor tweaks