some minor changed