Fix deletion, performance improvements, 1 unresolved issue