#427: Edits to help + setting choices
#428: Edits to help