slash and location map tweaks