minor fixes on the road to localization