Further refactoring of the comments system
Fixed a bug with the comment counts