Minor changes + comments.