minor fixes; all templates are ready now, yuppieee;