Updates to the the comments and some methods