Modified some comments, nothing major