comments for entries, monor 1st tier cleanup