fixed comments template
added comment count function & updated comments