Prevented deletion and destuctive update of comments, minor fixes also made