Added more data collection, fixed a bug with resetting, and fixed name problem