some template fixes; innn message template and entity debugging