#83 - two b/w badges, some other changes