Add guard dog template.  Some other fixes.