more post-merge work
unfuzzied a few strings
update stats