ENH: Debugged some of the loading data code.