Small fixes to yesterday's imported code, addition of string-based values for templates