Improve usage text, etc.