Upgrade ratom

with an enhancement and a bug and a bug fix from me :P