Bug Fixes & Client Contacts Mapping Updated