fixing some numbering issues