Group marker fixes/tweaks