Refactor, small map tweaks, social URLs