changed clean data code for Riskdata and added graph code and maps