updated reference modal, mapper, controller

reference modal fixes and reference mapping