more small templet changes