location bugfixes

^see title^