Semi-merge and minor updates to parameter descriptions