more templates changes and more small things.  also some other stuff.