adding templates
cleanup partial paths