more charts, better map, cleaned up a bit