updated comments, fixed minor issue