Updated many of the comments and also changed helpers to utilities.