deletion now works well, resolved #62, resolved #60, resolved #59