Rearrange params, update docs.