lots of base template updates