More Badges and Fix Checkin