prettier email formatting, categorized options, renamed some things, added some things...