updated doc and comments
updated doc and comments