added Comment and Delete functionality