delete capability and bug fixes