adding numbering and a few other things