Rewording and required fields. Closes #3, #17