Updated comments and fixed some state issues with DataReader