some work on tests and cleanup
i18n
update templates
i18n
update templates
i18n
i18n
update templates