some work
output tweaks