Template Management. Minor improvements.