[TASK] Using contact for email addreess, ts setting for default contact. General issues with the models

Also fixed other smaller issues