fixing numbering and adding listeners