Minor comments and changes