fixed the delete bugs, expanded lists