Add more comments and remove TODO tags.