Fixes and more consistent numbering