Debug modal delete, drawDrop, improve ergonomics