Changes on main_supplier_info logic, some more things