Updated Statistics Calculations and Added Types to Graph