small changes + comments.