Fixed a bug

Objects weren't initialized to null (DXL doesn't initialize by default
upon declaration)

Also refactored numbering.