support comment segment, and bug fix