template fixes; version