Various improvements to the doc and default params