Fix to comment counts and making them pluralized correclty