streamline stuff, adapter structure

and some i18n :o