Add support for additional EAS contact fields

* Fix a few misc. bugs found while testing
8 files changed