Some minor tidying of headers and a man page