delete option, bug fixes