Agenda numbering

Changes according your suggestions in IRC chat