Docs, plus fix for external templates