More misc tweaks, started working on the localization