Fix a numbering problem with classes 17 and 18. Update calendar and description.