Get deletions working and add debugging tools