cleanup and typo fixed
fixed location URI handling