more location fiddling