some changes
some corrects