further template dev, fixed more key and string problems