minor changes to output_tools
output tools merge conflict fix