Add a few extra params.
Update usage instructions and documentation.