Sorting plain params to correspond to code samples.

Also adding a couple that were missing.