update component shutdown handling.... not finished yet