fixed some minor problems and added TemplatePool