langauge cleanup, template fixes