some small fixes to output