TemplateSystem progress
Minor refactoring 
String utils