Fix command usage doc
Handle non-ascii headers better