bug fixed and add few comment