Updated comments and annotations.