improve output formatting, add headers