cleaned up templates a bit.
Updated pyrs submodule