router improvements, i18n (not working properly),