Fixing commands list order
Partly fixing ob numbering