Localization and other improvements