Merge fix for localization & Kyle's code