More changes, but mostly template stuff. (Git seems to throw unrelated stuff into random commits... odd.)