Localization stuff, design improvements