nick - added enterpriseId + bug fixes

nick - added enterpriseId + bug fixes