fixed templates, hopefully.