Updated doc and comments