Refactoring, fixed a little i18l, &c.