Got kwim to do the badge (and other nits)