more comprehensive minimization, safety updates