final fixes for template change
0.0.13-11