Fixing orbit box, and merge stack_id assignment