Improve usage description and add Todo