Some cosmetic changes and description updates