some comments in DataHandler and small changes