LQE-2 - Adding new template + some small other fixes