More doc and comments