Add error handling around field value saving.
Improve comments.
Add ms and cid to default map