Done some updating of comments