Amended some comments