Improving usage and documentation