delete feature support, minor bug fixes