Further refinement of the design, added comments counter.