Clean up badges; minor content changes