Fixed deleting options.  Still needs sort and edit of option names.