new comments added to the data handler and major bug fix in it