some minor adjust