Added a couple more headers
Disable colour if output redirected