various tweaks
switch to jinja