fixed double entries and order of comments