Add: disintegration/gift and some other fixes