Revise waiver+license options for new studies.

This also includes some text cleanup. Partial fix for #369.
Fix SELECT values vs. display strings.