Added ExceptionHandler, general cleanup, added 'delete' action