Fix sizing to fit in dialog
Improve comment handling
Include alternate email addresses