Doc typo
Improve templates