naming tweaks
output tweaks