better localization failsafe. updated them as wel