Fixed comment parsing and duplicate entries in lists.