Handle deleting non-existent items, fixed merging, misc bug fixes.