optimized display methods & more coherent numbering