[chg] some adjusts