New options and descriptions
Documentation fixes