Some work on name tags; many script tweaks