[IMP]minor improvments.