A few bugs corrected for data dumping