data model bugs fixed per JB email v3