New endcomment + language fix