merge some minor changes