Added charts and polished code