Updated the comments, also fixing #94