Swaddle weaning update

Well NJ is doing fine without being swaddled despite the fact that it's the way he has slept since birth. The first night (no swaddle, no nothing) was rough. The second night (with sleep sack) was rough. The third night, he was up at 8:00, 9:00 then did a stretch from 9pm to 4am, which is great for us! The fourth night, he regressed a bit- up at 10:30, 12:30, 1:30, 5:00. He usually goes back to sleep with some light patting and shushing. We'll see how it goes tonight. He has rolled over with it but it was in his sleep and it didn't wake him. His biggest problem still are that he bumps into the railings and that sometimes when he transitions between sleep cycles, he scratches at his face and that wakes him up. I've been putting no-scratch mittens on but we keep losing them. Tonight, he has socks on his hands. Whatever it takes!