Much improved usage message
Support and test for custom output.