Add messages and correct bugs on deletion