Made some improvements to Location functionality