Replaced separate xsl:messages and xsl:comments

Most now call template commentAndMessage