fixed base templates, added analitic docs