Documentation work on Badge control, cleanup