more lcoation tweaks.