Locale added to settings + init fix and minor cleanup...