More touchups to tamplates and how pools are generated.