Ok... a few minor badge fixes and such.