make charts work again and add some new charts