Improve instructions

Improve instructions in README.md.
Add missing option in usage output.
Remove TODO that is now resolved.