Fixing data issues and adding graph viz