joey,
swaddle:
dun worry about the swaddle thing, i am doing that too, according to the happiest bb on the block, even if swaddle until 5-6 mth also okay, no problem as long as the bb is comfortable, after that they will be ok, theory is that newborn are disturb by too much movement, their arm flapping about and unsecure so cannot sleep well, when they grow older, they become more and more stable and secure so even then dun swaddle will be okay, not to worry.