fixed more template stuff