Reimplemented envelope carry to be more like other players
Further fixes to IT envelope behavior