Argument renaming and clarifications to documentation.