Added /all and a few template functions