Fixed some errors and added data dump