location fixes. added international support