fixed numbering issues