Minor bug fixes and Delete confirmation boxes.