Cleanup.
Filled in handlers for accts and email patterns.