added missing packages
tidy
perf improvements
using templateCache