Components numeration, description fixes