updated comments, class declarations