Add various badges
Remove un-needed return in __setstate__()