Add batch deletion, minor fixes.