Improve documentation and options