comments and template fixes