Fixed deletion issues
working on email part. other fixed