more leader goodness and update on jinja script