Made some improvements to effective template calculator, fixed template definitions in project