fix soft delete, and other progress