Cleaned up data; added graphs