Better outputting and formatting