Added some logs and corrected the template file names