Add john-jumbo; remove a few