set of editorial fixes to the template import