Fixing everything except for item movement that got lost in merge