Updated some code, fixed a copy/paste bug with the delete exception