Improves CLI help messages.
Fixes options specs