adding localeurl, and some changes