Add feedback email address.
Refactor the keys.