improvements in template/images