Bump; added some, removed some others.