Minor update and comments